TAGs: improve performance